From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Fri, 23 Aug 2013 16:49:04 +0000 (-0400)
Subject: userWidget: Actually respect the iconSize parameter
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~3631
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=1a415d5fa7b970de588171cc4eb444e1d9a7eff7;p=gnome-shell.git

userWidget: Actually respect the iconSize parameter

The iconSize parameter was only being respected if it was the
default icon fallback.

https://bugzilla.gnome.org/show_bug.cgi?id=706681
---

diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 5838cde2a..320c43013 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -2244,8 +2244,6 @@ StScrollBar StButton#vhandle:active {
 .framed-user-icon {
     border: 2px solid #8b8b8b;
     border-radius: 5px;
-    width: 48pt;
-    height: 48pt;
     background-size: contain;
 }
 
diff --git a/js/ui/userWidget.js b/js/ui/userWidget.js
index 47c28aad0..f801a5439 100644
--- a/js/ui/userWidget.js
+++ b/js/ui/userWidget.js
@@ -29,7 +29,9 @@ const Avatar = new Lang.Class({
 
         this.actor = new St.Bin({ style_class: params.styleClass,
                                   track_hover: params.reactive,
-                                  reactive: params.reactive });
+                                  reactive: params.reactive,
+                                  width: this._iconSize,
+                                  height: this._iconSize });
     },
 
     setSensitive: function(sensitive) {